diff --git a/swh/web/ui/templates/api-endpoints.html b/swh/web/ui/templates/api-endpoints.html
index 0e588d10..12e82598 100644
--- a/swh/web/ui/templates/api-endpoints.html
+++ b/swh/web/ui/templates/api-endpoints.html
@@ -1,61 +1,62 @@
 {% extends "layout.html" %}
-{% block title %}API endpoints{% endblock %}
+{% block title %} Software Heritage API – Endpoints {% endblock %}
 {% block content %}
 
 <nav class="bread-crumbs">
   <ul>
     <li><a href="/">API</a></li>
     <li>/</li>
     <li>endpoints</li>
   </ul>
 </nav>
 <div class="api-doc">
-  This lists the current API endpoints for version 1. For a more general description, please refer
-  to <a href="/api/">the main documentation</a>.
+  Below you can find a list of available and upcoming endpoints for version 1
+  of the Software Heritage API. For a more general introduction please refer to
+  the <a href="/api/">API overview</a>.
 
   <noscript>
   <p>
     <ul>
     {% for route, doc in doc_routes %}
       <li><a href="#{{ route }}">{{ route }}</a></li>
     {% endfor %}
     </ul>
   </p>
   </noscript>
 </div>
 
 <div class="api-doc table-responsive">
   <table class="table table-striped search-res swhtable">
     <thead class="thead-default">
       <th>Route</th>
       <th>Status</th>
       <th>Description</th>
     </thead>
     <tbody>
       {% for route, doc in doc_routes %}
       <tr class="api-doc-route{% for tag in doc['tags'] %} api-doc-route-{{ tag }} {% endfor %}">
         {% if 'tags' in doc and doc['tags'] is not none %}
         <td id="{{ route }}">{{ route }}</td>
         <td>{{ ', '.join(doc['tags']) }}</td>
         {% else %}
         <td id="{{ route }}"><a href="{{ route }}">{{ route }}</a></td>
         <td>opened</td>
         {% endif %}
         <td>{{ doc['docstring'] | safe_docstring_display | safe }}</td>
       </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 <script type="text/javascript">
   $(document).ready(function() {
     $('table.swhtable').DataTable({
          "paging": false,
          "info": false,
          "order": [[1, "asc"]]
       });
     $(".dataTables_filter input").addClass("form-control")
 
   });
 </script>
 {% endblock %}
diff --git a/swh/web/ui/templates/api.html b/swh/web/ui/templates/api.html
index 12236a5c..aea67036 100644
--- a/swh/web/ui/templates/api.html
+++ b/swh/web/ui/templates/api.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% block title %}API Documentation{% endblock %}
+{% block title %} Software Heritage API &ndash; Overview {% endblock %}
 {% block content %}
 
 <div class="api-doc">
   {% include 'includes/apidoc-header.html' %}
 </div>
 {% endblock %}
diff --git a/swh/web/ui/templates/apidoc.html b/swh/web/ui/templates/apidoc.html
index b543f456..864a8a46 100644
--- a/swh/web/ui/templates/apidoc.html
+++ b/swh/web/ui/templates/apidoc.html
@@ -1,123 +1,123 @@
 {% extends "layout.html" %}
-{% block title %} API overview {% endblock %}
+{% block title %} Software Heritage API &ndash; {{ route }} {% endblock %}
 {% block content %}
 <nav class="bread-crumbs">
   <ul>
     <li><a href="/">API</a></li>
     <li>/</li>
     <li><a href="/api/1/">endpoints</a></li>
     <li>/</li>
     <li>{{ request.path }}</li>
   </ul>
 </nav>
 
 {% if docstring %}
 <div class="docstring">
   <h2> Description </h2>
   {{ docstring | safe_docstring_display | safe }}
 </div>
 {% endif %}
 {% if response_data and response_data is not none %}
 <div class="response-data">
   <h2> Request </h2>
   <pre><strong>{{ request.method }}</strong> {{ request.url }}</pre>
   {% if headers_data and headers_data is not none %}
   <h2> Headers </h2>
     {% for header_name, header_value in headers_data.items() %}
       <pre><strong>{{ header_name }}</strong> {{ header_value | urlize_header_links | safe }}</pre>
     {% endfor %}
   {% endif %}
     <h2> Result </h2>
     <pre>{{ response_data | urlize_api_links | safe }}</pre>
 </div>
 {% endif %}
 <hr/>
 <div class="doc-urls">
   <table class="m-x-auto table">
     <thead>
       <tr>
 	<th>URL</th>
 	<th>Allowed Methods</th>
       </tr>
     </thead>
     <tbody>
       {% for url in urls %}
       <tr>
 	<td>
 	  {{ url['rule'] }}
 	</td>
 	<td>
 	  {{ url['methods'] | sort | join(', ') }}
 	</td>
       </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 <hr/>
 {% if args and args|length > 0 %}
 <div class="doc-args">
   <h2> Args </h2>
   <dl class="doc-argslist dl-horizontal">
     {% for arg in args %}
     <dt> {{ arg['name'] }}: {{ arg['type'] }} </dt>
     <dd> {{ arg['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
  </div>
 {% endif %}
 {% if params and params|length > 0 %}
 <div class="doc-params">
   <h2> Params </h2>
   <dl class="doc-paramslist dl-horizontal">
     {% for param in params %}
     <dt> {{ param['name'] }}: string </dt>
     <dd> {{ param['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
  </div>
 {% endif %}
 {% if excs and excs|length > 0 %}
 <div class="doc-excs">
   <h2> Raises </h2>
   <dl class="doc-excslist dl-horizontal">
     {% for exc in excs %}
     <dt> {{ exc['exc'] }} </dt>
     <dd> {{ exc['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% if headers %}
 <div class="doc-headers">
   <h2> Headers </h2>
   <dl class="doc-headers dl-horizontal">
     {% for header in headers %}
     <dt> {{ header['name'] }}: string </dt>
     <dd> {{ header['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% if return %}
 <div class="doc-return">
   <h2> Returns </h2>
   <dl class="doc-return dl-horizontal">
     <dt> {{ return['type'] }} </dt>
     <dd> {{ return['doc'] | safe_docstring_display | safe }} </dd>
   </dl>
 </div>
 {% endif %}
 {% if examples %}
 <div class="doc-example">
   <h2> Examples </h2>
   <dl class="doc-example dl-horizontal">
   {% for example in examples %}
     <dd>
       <a href="{{ example }}">{{ example }}</a>
     </dd>
   {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/ui/templates/layout.html b/swh/web/ui/templates/layout.html
index 5eb89f24..cba035c1 100644
--- a/swh/web/ui/templates/layout.html
+++ b/swh/web/ui/templates/layout.html
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block title %}{% endblock %} - The Software Heritage Archive</title>
+    <title>{% block title %}{% endblock %}</title>
     <!-- BEGIN: bootstrap -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" integrity="sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css" integrity="sha384-aUGj/X2zp5rLCbBxumKTCw2Z50WgIr1vs/PFN4praOTvYXWlVyh2UtNUU0KAUhAX" crossorigin="anonymous">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-responsive.min.css') }}">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>
     <!-- END: bootstrap -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/pygment.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/jquery.dataTables.min.css') }}">
     <script src="{{ url_for('static', filename='lib/jquery.dataTables.min.js') }}"></script>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}" />
     <script>document.domain = "softwareheritage.org";</script>
 
   </head>
   <body>
     <a id="top"></a>
     <div class="jumbotron">
       <nav class="navbar navbar-default" id="swh-navbar-collapse">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed"
                   data-toggle="collapse" data-target="#swh-navbar-collapse" aria-expanded="false"> <!-- screen-reader -->
 	    <span class="sr-only">Toggle navigation menu</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
           <a class="navbar-brand" style="padding:5px" href="{{ url_for('homepage') }}"> <!-- logo -->
             <img alt="SWH Archive" src="{{ url_for('static', filename='img/swh-logo.png') }}" class="swh-logo" />
           </a>
           <a class="navbar-brand sitename" href="{{ url_for('homepage') }}">
             <span class="first-word">Software</span> <span class="second-word">Heritage</span>
           </a>
         </div>
 
         <nav class="nav nav-horizontal">
           <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
               <li role="separator" class="divider"></li>
               <li><a href="{{ url_for('browse_api_doc') }}" class="dropdown-toggle" data-toggle="dropdown"
                      role="button" aria-haspopup="true" aria-expanded="false">API <span class="caret"></span></a>
                 <ul class="dropdown-menu">
                   {% include 'includes/apidoc-header-toc.html' %}
                 </ul>
               </li>
               <li role="separator" class="divider"></li>
               <li><a href="{{ url_for('about') }}">About</a></li>
             </ul>
           </div>
         </nav>
       </nav>
     </div>
     <div class="container">
       <div class="container">
 	<h1>{{ self.title() }}</h1>
       </div>
       {% with messages = get_flashed_messages(with_categories=true) %}
       {% if messages %}
       <div class="container messages">
         {% for category, message in messages %}
         <div class="alert alert-{{ category }}" role="alert">{{ message }}</div>
         {% endfor %}
       </div>
       {% endif %}
       {% endwith %}
       <div class="container content">
         {% block content %}{% endblock %}
       </div>
     </div>
     <div id="back-to-top">
       <a href="#top"><img alt="back to top" src="{{ url_for('static', filename='img/arrow-up-small.png') }}" /></a>
     </div>
   </body>
 </html>